From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 24 Jul 2004 21:37:11 +0000 (+0000)
Subject: (Fexpand_abbrev): Run Qpre_abbrev_expand_hook
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~21553
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=eadbed2553cbcc32553c79155adf63ac25aa9e65;p=emacs.git

(Fexpand_abbrev): Run Qpre_abbrev_expand_hook
only when a real abbrev is present.
---

diff --git a/src/abbrev.c b/src/abbrev.c
index ac132f20023..37ab640ee43 100644
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -248,8 +248,6 @@ Returns the abbrev symbol, if expansion took place.  */)
 
   value = Qnil;
 
-  Frun_hooks (1, &Qpre_abbrev_expand_hook);
-
   wordstart = 0;
   if (!(BUFFERP (Vabbrev_start_location_buffer)
 	&& XBUFFER (Vabbrev_start_location_buffer) == current_buffer))
@@ -326,6 +324,8 @@ Returns the abbrev symbol, if expansion took place.  */)
   if (INTEGERP (sym) || NILP (SYMBOL_VALUE (sym)))
     return value;
 
+  Frun_hooks (1, &Qpre_abbrev_expand_hook);
+
   if (INTERACTIVE && !EQ (minibuf_window, selected_window))
     {
       /* Add an undo boundary, in case we are doing this for